Fix many cats-kernel instances. #1324
+534
−158
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.